1 files changed, 53 insertions, 1 deletions

diff --git a/src/video_core/renderer_vulkan/vk_blit_screen.cpp b/src/video_core/renderer_vulkan/vk_blit_screen.cpp
index 1e0fdd3d9..7cdde992b 100644
--- a/src/video_core/renderer_vulkan/vk_blit_screen.cpp
+++ b/src/video_core/renderer_vulkan/vk_blit_screen.cpp
@@ -37,6 +37,10 @@
 #include "video_core/vulkan_common/vulkan_memory_allocator.h"
 #include "video_core/vulkan_common/vulkan_wrapper.h"
 
+#ifdef ANDROID
+extern u32 GetAndroidScreenRotation();
+#endif
+
 namespace Vulkan {
 
 namespace {
@@ -74,7 +78,48 @@ struct ScreenRectVertex {
     }
 };
 
-constexpr std::array<f32, 4 * 4> MakeOrthographicMatrix(f32 width, f32 height) {
+#ifdef ANDROID
+
+std::array<f32, 4 * 4> MakeOrthographicMatrix(f32 width, f32 height) {
+    constexpr u32 ROTATION_0 = 0;
+    constexpr u32 ROTATION_90 = 1;
+    constexpr u32 ROTATION_180 = 2;
+    constexpr u32 ROTATION_270 = 3;
+
+    // clang-format off
+    switch (GetAndroidScreenRotation()) {
+        case ROTATION_0:
+            // Desktop
+            return { 2.f / width, 0.f,          0.f, 0.f,
+                     0.f,         2.f / height, 0.f, 0.f,
+                     0.f,         0.f,          1.f, 0.f,
+                    -1.f,        -1.f,          0.f, 1.f};
+        case ROTATION_180:
+            // Reverse desktop
+            return {-2.f / width, 0.f,          0.f, 0.f,
+                     0.f,        -2.f / height, 0.f, 0.f,
+                     0.f,         0.f,          1.f, 0.f,
+                     1.f,         1.f,          0.f, 1.f};
+        case ROTATION_270:
+            // Reverse landscape
+            return { 0.f,         -2.f / width, 0.f, 0.f,
+                     2.f / height, 0.f,         0.f, 0.f,
+                     0.f,          0.f,         1.f, 0.f,
+                    -1.f,          1.f,         0.f, 1.f};
+        case ROTATION_90:
+        default:
+            // Landscape
+            return { 0.f,          2.f / width, 0.f, 0.f,
+                    -2.f / height, 0.f,         0.f, 0.f,
+                     0.f,          0.f,         1.f, 0.f,
+                     1.f,         -1.f,         0.f, 1.f};
+    }
+    // clang-format on
+}
+
+#else
+
+std::array<f32, 4 * 4> MakeOrthographicMatrix(f32 width, f32 height) {
     // clang-format off
     return { 2.f / width, 0.f,          0.f, 0.f,
              0.f,         2.f / height, 0.f, 0.f,
@@ -83,6 +128,8 @@ constexpr std::array<f32, 4 * 4> MakeOrthographicMatrix(f32 width, f32 height) {
     // clang-format on
 }
 
+#endif
+
 u32 GetBytesPerPixel(const Tegra::FramebufferConfig& framebuffer) {
     using namespace VideoCore::Surface;
     return BytesPerBlock(PixelFormatFromGPUPixelFormat(framebuffer.pixel_format));
@@ -441,7 +488,12 @@ void BlitScreen::DrawToSwapchain(Frame* frame, const Tegra::FramebufferConfig& f
     if (const std::size_t swapchain_images = swapchain.GetImageCount();
         swapchain_images != image_count || current_srgb != is_srgb) {
         current_srgb = is_srgb;
+#ifdef ANDROID
+        // Android is already ordered the same as Switch.
+        image_view_format = current_srgb ? VK_FORMAT_R8G8B8A8_SRGB : VK_FORMAT_R8G8B8A8_UNORM;
+#else
         image_view_format = current_srgb ? VK_FORMAT_B8G8R8A8_SRGB : VK_FORMAT_B8G8R8A8_UNORM;
+#endif
         image_count = swapchain_images;
         Recreate();
     }